Merge branch 'master' of github.com:SiriDB/siridb-server
authorJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 14 Jun 2018 14:22:13 +0000 (16:22 +0200)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 14 Jun 2018 14:22:13 +0000 (16:22 +0200)

Trivial merge